From 835f3921962bd0e66ae0e0238099ad124a57c548 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 26 May 2019 22:37:42 -0400 Subject: [PATCH] scrollbar: Make final --- gtk/gtkscrollbar.c | 12 ++++++++++++ gtk/gtkscrollbar.h | 20 -------------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index 64d81769cf..82b3d7959e 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -81,6 +81,18 @@ * classes related to overlay scrolling (.overlay-indicator, .dragging, .hovering). */ +typedef struct _GtkScrollbarClass GtkScrollbarClass; + +struct _GtkScrollbar +{ + GtkWidget parent_instance; +}; + +struct _GtkScrollbarClass +{ + GtkWidgetClass parent_class; +}; + typedef struct { GtkOrientation orientation; GtkWidget *box; diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h index 1926e8f355..886cc85fe3 100644 --- a/gtk/gtkscrollbar.h +++ b/gtk/gtkscrollbar.h @@ -37,30 +37,10 @@ G_BEGIN_DECLS #define GTK_TYPE_SCROLLBAR (gtk_scrollbar_get_type ()) #define GTK_SCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbar)) -#define GTK_SCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLBAR, GtkScrollbarClass)) #define GTK_IS_SCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLBAR)) -#define GTK_IS_SCROLLBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SCROLLBAR)) -#define GTK_SCROLLBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SCROLLBAR, GtkScrollbarClass)) typedef struct _GtkScrollbar GtkScrollbar; -typedef struct _GtkScrollbarClass GtkScrollbarClass; - -struct _GtkScrollbar -{ - GtkWidget parent_instance; -}; - -struct _GtkScrollbarClass -{ - GtkWidgetClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; GDK_AVAILABLE_IN_ALL -- 2.30.2